Skip to content

OSDOCS-14757 greatly reducing GCP sample install config files#93709

Merged
bscott-rh merged 1 commit intoopenshift:mainfrom
bscott-rh:OSDOCS-14757
Mar 16, 2026
Merged

OSDOCS-14757 greatly reducing GCP sample install config files#93709
bscott-rh merged 1 commit intoopenshift:mainfrom
bscott-rh:OSDOCS-14757

Conversation

@bscott-rh
Copy link
Copy Markdown
Contributor

@bscott-rh bscott-rh commented May 22, 2025

Version(s):
4.16+

Issue:
https://issues.redhat.com/browse/OSDOCS-14757

Link to docs preview:
Customizations
Private cluster
Shared VPC
Existing VPC
Disconnected env

QE review:

  • QE has approved this change.

Additional information:
I modified the installation-initializing-manual.adoc file to present important parameters for XPN and private installs.

@bscott-rh bscott-rh added this to the Planned for 4.19 GA milestone May 22, 2025
@openshift-ci openshift-ci Bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 22, 2025
@ocpdocs-previewbot
Copy link
Copy Markdown

ocpdocs-previewbot commented May 22, 2025

🤖 Mon Mar 16 15:29:01 - Prow CI generated the docs preview:
https://93709--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

Comment thread modules/installation-gcp-config-yaml-simple.adoc
@bscott-rh bscott-rh changed the title OSDOCS-14757 simplified GCP install config yaml file, replaced shared vpc config yaml OSDOCS-14757 greatly reducing GCP sample install config files May 22, 2025
name: master
replicas: 3
platform:
gcp:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure how minimal you want to go but this type may not be required, but if you do want to show the structure there are certainly other fields that could be mentioned here.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I am open to suggestions. At a minimum I'd like to put 1 parameter in each section. is there another you would recommend?

type: n2-standard-4
metadata:
name: test-cluster
networking: <4>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a default, you may be able to drop the networking section. I am sure that this is present in the base install config.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to include the networking stanza because this sample is also included in the "...with network customizations" installation procedure so I want to show what that portion of the file looks like.

<6> The name of the GCP project where you want to install the cluster.
<7> Optional. One or more network tags to apply to compute machines, control plane machines, or all machines.
<8> You can optionally provide the `sshKey` value that you use to access the machines in your cluster. No newline at end of file
<1> The name of the subnet in the shared VPC for compute machines to use.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The credentialsMode still applies I believe. Should be leave that or mention it somewhere else ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going off of what we have the parameters table, which is "If no mode is specified, the CCO dynamically tries to determine the capabilities of the provided credentials, with a preference for mint mode on the platforms where multiple modes are supported. "

would you recommend we still specify credentials mode? if so, which mode should we put in the sample?

@barbacbd
Copy link
Copy Markdown
Contributor

barbacbd commented Jun 3, 2025

/cc @patrickdillon

@openshift-ci openshift-ci Bot requested a review from patrickdillon June 3, 2025 14:47
hostPrefix: 23
platform: <5>
gcp:
projectID: sample-project
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

platform.gcp.region is also a required field.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bscott-rh Besides, I'm trying to understand the updates, for example, in the 4.18 doc chapter "Chapter 6. Installing a cluster on GCP in a disconnected environment", the section "6.5. Creating the installation configuration file" explains how to edit "install-config.yaml" to give the additional information that is required for an installation in a restricted network. But in your changes, it seems no such info, how do you expect the end-users know generally what's required?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jianli-wei , I am resuming work on this ticket finally :) I will add the region parameter.

Regarding the updates, if the correct information is in the "Creating the installation configuration file" procedure, then it is okay for it to be removed from the sample install-config.yaml file, because the sample file is only meant to be a reference for the syntax of the file, not a complete config file. Does that make sense?

@bergerhoffer
Copy link
Copy Markdown
Contributor

The branch/enterprise-4.20 label has been added to this PR.

This is because your PR targets the main branch and is labeled for enterprise-4.19. And any PR going into main must also target the latest version branch (enterprise-4.20).

If the update in your PR does NOT apply to version 4.20 onward, please re-target this PR to go directly into the appropriate version branch or branches (enterprise-4.x) instead of main.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 16, 2025
@openshift-bot
Copy link
Copy Markdown

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Sep 15, 2025
@openshift-bot
Copy link
Copy Markdown

Stale issues rot after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

@openshift-ci openshift-ci Bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Oct 16, 2025
@bergerhoffer bergerhoffer added this to the Continuous Release milestone Oct 20, 2025
@bergerhoffer
Copy link
Copy Markdown
Contributor

The branch/enterprise-4.21 label has been added to this PR.

This is because your PR targets the main branch and is labeled for enterprise-4.20. And any PR going into main must also target the latest version branch (enterprise-4.21).

If the update in your PR does NOT apply to version 4.21 onward, please re-target this PR to go directly into the appropriate version branch or branches (enterprise-4.x) instead of main.

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2025
@bscott-rh
Copy link
Copy Markdown
Contributor Author

/remove-lifecycle rotten

@openshift-ci openshift-ci Bot removed the lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. label Oct 30, 2025
@openshift-bot
Copy link
Copy Markdown

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jan 30, 2026
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 30, 2026
@jianli-wei
Copy link
Copy Markdown

@bscott-rh Only one minor suggestion, it is about the "Disconnected env" section, the "e. Set the publishing strategy to Internal:" is not mandatory for installing in disconnected env, so suggest to mark it as optional or delete it. Thanks!

@bscott-rh
Copy link
Copy Markdown
Contributor Author

@bscott-rh Only one minor suggestion, it is about the "Disconnected env" section, the "e. Set the publishing strategy to Internal:" is not mandatory for installing in disconnected env, so suggest to mark it as optional or delete it. Thanks!

Updated, thanks

@jianli-wei
Copy link
Copy Markdown

/verified by jiwei

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 11, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@jianli-wei: This PR has been marked as verified by jiwei.

Details

In response to this:

/verified by jiwei

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@bscott-rh bscott-rh added the merge-review-needed Signifies that the merge review team needs to review this PR label Mar 11, 2026
@maxwelldb maxwelldb added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Mar 16, 2026
@maxwelldb maxwelldb self-requested a review March 16, 2026 14:32
Copy link
Copy Markdown
Contributor

@maxwelldb maxwelldb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lookin' good!

Comment thread modules/installation-initializing-manual.adoc Outdated
@maxwelldb maxwelldb added ok-to-merge and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Mar 16, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Mar 16, 2026

@bscott-rh: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@bscott-rh bscott-rh merged commit 2b05d92 into openshift:main Mar 16, 2026
2 checks passed
@bscott-rh
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20
/cherrypick enterprise-4.21
/cherrypick enterprise-4.22

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: #93709 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-14757 simplified install config yaml file, replaced shared vpc config yaml
Using index info to reconstruct a base tree...
M	installing/installing_gcp/installing-gcp-customizations.adoc
M	installing/installing_gcp/installing-gcp-private.adoc
M	installing/installing_gcp/installing-gcp-shared-vpc.adoc
M	installing/installing_gcp/installing-gcp-vpc.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
M	modules/installation-initializing-manual.adoc
M	modules/installation-initializing.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-initializing.adoc
CONFLICT (content): Merge conflict in modules/installation-initializing.adoc
Auto-merging modules/installation-initializing-manual.adoc
Removing modules/installation-gcp-shared-vpc-config.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
Auto-merging installing/installing_gcp/installing-gcp-vpc.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-vpc.adoc
Auto-merging installing/installing_gcp/installing-gcp-shared-vpc.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-shared-vpc.adoc
Auto-merging installing/installing_gcp/installing-gcp-private.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-private.adoc
Auto-merging installing/installing_gcp/installing-gcp-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-customizations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-14757 simplified install config yaml file, replaced shared vpc config yaml

Details

In response to this:

/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20
/cherrypick enterprise-4.21
/cherrypick enterprise-4.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: #93709 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-14757 simplified install config yaml file, replaced shared vpc config yaml
Using index info to reconstruct a base tree...
M	installing/installing_gcp/installing-gcp-customizations.adoc
M	installing/installing_gcp/installing-gcp-private.adoc
M	installing/installing_gcp/installing-gcp-shared-vpc.adoc
M	installing/installing_gcp/installing-gcp-vpc.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
M	modules/installation-initializing-manual.adoc
M	modules/installation-initializing.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-initializing.adoc
CONFLICT (content): Merge conflict in modules/installation-initializing.adoc
Auto-merging modules/installation-initializing-manual.adoc
Removing modules/installation-gcp-shared-vpc-config.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
Auto-merging installing/installing_gcp/installing-gcp-vpc.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-vpc.adoc
Auto-merging installing/installing_gcp/installing-gcp-shared-vpc.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-shared-vpc.adoc
Auto-merging installing/installing_gcp/installing-gcp-private.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-private.adoc
Auto-merging installing/installing_gcp/installing-gcp-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-customizations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-14757 simplified install config yaml file, replaced shared vpc config yaml

Details

In response to this:

/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20
/cherrypick enterprise-4.21
/cherrypick enterprise-4.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: #93709 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-14757 simplified install config yaml file, replaced shared vpc config yaml
Using index info to reconstruct a base tree...
M	installing/installing_gcp/installing-gcp-customizations.adoc
M	installing/installing_gcp/installing-gcp-private.adoc
M	installing/installing_gcp/installing-gcp-shared-vpc.adoc
M	installing/installing_gcp/installing-gcp-vpc.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
M	modules/installation-initializing.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-initializing.adoc
CONFLICT (content): Merge conflict in modules/installation-initializing.adoc
Removing modules/installation-gcp-shared-vpc-config.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
Auto-merging installing/installing_gcp/installing-gcp-vpc.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-vpc.adoc
Auto-merging installing/installing_gcp/installing-gcp-shared-vpc.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-shared-vpc.adoc
Auto-merging installing/installing_gcp/installing-gcp-private.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-private.adoc
Auto-merging installing/installing_gcp/installing-gcp-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-customizations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-14757 simplified install config yaml file, replaced shared vpc config yaml

Details

In response to this:

/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20
/cherrypick enterprise-4.21
/cherrypick enterprise-4.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: new pull request created: #108389

Details

In response to this:

/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20
/cherrypick enterprise-4.21
/cherrypick enterprise-4.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: new pull request created: #108390

Details

In response to this:

/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20
/cherrypick enterprise-4.21
/cherrypick enterprise-4.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: new pull request created: #108391

Details

In response to this:

/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20
/cherrypick enterprise-4.21
/cherrypick enterprise-4.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: new pull request created: #108392

Details

In response to this:

/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20
/cherrypick enterprise-4.21
/cherrypick enterprise-4.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.